- Options to disable GI, Various fixes