Re-add in commit ce538b7 tweaks