other minor fixes for activator