Worked on compiler warnings