Some fixes to get changes to work.