Fixes for cadenza