few changes to fix some build errors