Fix and hacks.