fix a few more issues with the build

Signed-off-by: Joshua Rubin <jrubin@zvelo.com>