fixed CsMap build issues