Fixes for Ch5