Some additional small tweaks.