Redo more fixes. WHY IS VCS SO HARD :'(