Cleacase tweaks