Introduce Shin workarounds