Fix for various missing downstates across templates