Complie fixes & Map fix.