More updates to handling of VPS