level03-based fixes