Some gotchas after upgrading to CRUX 2.6