MMAPS: Compile fixes