Minor bug fixes and maps