Fixes for start and cleanup