Minor formatting etc. fixes