Small fixes, maps disabled for now