Fixes and tweaks to the previous.