Fixing some old workarounds