Last sprint: implement (specific) workarounds for some limitations.