More updates to build_bottle