Miscellaneous tweaks
Fix initializing internal state in start()