Fixing errors from second round of testing