Fix compile errors...finally