tweaks to help with setup