Additional tweaks towards a chicken 5 version