XXX To compile on Linux
XXX rebase