Workarounds for 2.063 issues