Various tweaks to ensure no wonky issues