fixes related to importing templates