Minor changes, fixes.