Implemented fix for code warnings