more compilation fixes, many more to go