Removed a few Code Analysis warnings