Fixes for virgin template