Fixing template issues