Fixed issues detected