a few changes to turn off warnings