Fixed error in application, lint fixes...