updates to allow pip packages to install cleanly

@kdodia can you test this out?