Add stuff missing from initial commit