Fixes for activator templates