More tweaks to devise