Fixed P4_22 errors