a couple fixes.