Static code analysis fixes + Maven improvements