Merge "Fixes static analysis issues"