Some fixes to further test geo and dynamic loading