Fixed more compile errors of framework