Some minor touches, here and there