Some minor fixes and touchup