Misc. hacks to make work.