Misc small changes prior to release 1.0