A couple fixes.