Fixed moar bugs