Misc workarounds.