Fixed uninitialized map occupied properties
Housekeeping