Fixed more borken stuff