Minor tweaks to try and get admin component tests passing