Additional tweaks to enable chicken 5