* Fix various non-functional issues