Resolve some dev-mode warnings.