Minor changes

See commits below