more changes to try and get v1.0 compilation working