more fixes.. please sync!