Add some WIP patches.