A few more tweaks to uncomfortable