Fixing up some minor issues that Brandon broke