Additional fixes for chicken 5 compatibility