007.04 More bugs fixed