Making a couple other changes so things run properly