Committing some tweaks.