Fix first errors found during testing