Small fixes to map rendering