small changes to allow compile