Bugs fixed B05007-12