Fixing Code Analysis Errors

@RichiCoder1 what do you think?