Fixes and tweaking.