Fix compile errors #18