More uncommitted things

See above