Fixed issues with application