Advanced inv fixes