Couple of little mistakes leftover from refactoring