Eliminated warnings due to static analysis