Add basic workarounds