fixes for vpc