fix some build issues

Signed-off-by: Joshua Rubin <jrubin@zvelo.com>
Merge branch 'develop'