Simple build fixes

... and now w/o stupid rebase mistakes ...