Fixes for build borks from franco additions

Signed-off-by: MassStash <MassStash@gmail.com>