Fixing more tiny things