More changes to make things work properly.