Fixed compile errors + added missing files