More tweaks to improve mobility of blocks