crushmap fixes