Fixed two small bugs related to an older refactor.