Towards compiling on 2.4