Fixed remaining static analyzer warnings