Bug fixes from Lab testing