More various coercion fixes