small changes to cope with previous changes