minor cleanup with static casting
fixes for rumble