Fix issues from bad merging #2