Smallish batch of fixes