Fixed last few warnings with char* not being const