Fixed maps and various other things for non-admin users