All tests green again now
Minor fixes