Some changes to stuff