Try to fix buggy stuff, take 1.