Now compiles cleanly on f17 and f12