Fixed first round of compile errors