Fixes from LOR #1