Fixed some minor errors after first test