Fixed changes

Some changes needed to be fixed from last push