Minor changes to address warnings and errors (Compiler & Find bugs)