Small initial fixes.