Fixes and tweaks.