some more compile-errors fixed