Fixes and tweaks during paper revisions