Workaround oustanding bugs.