Made everything compile properly