v11.4, minor bugs fixed