Various small changes, batched together