Two bugs have been fixed