Fixed moar errors