those crazy code analysis fixes...