Batch of misc changes