Fix for 3 remaining or specs. Or specs now all pass. #176