Fixes for newer template style