fix some bitwise nagging