Updated to quiet some pedantic compiler warnings