Some minor fixings