Fixed some misc warnings
Actually commit the code