Cleanup, hide coercion warnings