Fixes for latest Flambe.