Fixed minor errors after test