Other minor improvements