Several fixes from Friday meeting