Jimen Ching's patches to remove compiler warnings