[ci skip] Several minor improvements and corrections