fixed compile problems from last commit