Hotfix botoelb vpc fixes