fixed build on master

Master now builds cleanly with these changes.

Fixes #2