Minor fixings
More minor fixings