General minor improvements