Fix a couple bugs introduced in refactor

Created by  Nathan Jaremko  on July 17, 2020
NGM34AODYBABJGPWHH3I27EX4C7FZ4B2FWZB45MWPRTIUNRDOSXAC
Change contents