public areas and mapper fixes