Two bugs fixed.