Some more fixes to try and resolve the redesign