Small fixes. About to integrate the mask system under body