Fixed Stuff causing compiler warnings