More pedantic C++ casts, change bamaux value for the sake of sanity