action_support fixes