Just some simple changes to fix things from last merge