Fix for application lint errors