Fix code to comply more with audits under controller package. 

NT