Fixed semi-important stuff