Various small fixes based on reviewer comments