Minor fix and a few tweaks.