Fine tune workarounds