#862 Additional minor improvements