Fix compile errors against bleeding-edge CS. Also, the dejavu font vfs path changed...