Changing handling of some things