Cleanup/recompile fix.