Continueing tiny fixes.