Misc small corrections