More tweaks

More tweaks.