Various updates to make the default apps easier to work with