Very small tweaks to bast templates