Stop R17 compile issues