[Build] Fixed up mangosd solutions, movemap still broken