Fix use of AUTHORIZE_CLS_PROP
Fix expected constructor args
Fix potential NPE in constructor