Fixes for the template