Fixed a few glaring issues from the last commit