Dev/misc

Assorted small changes