Fragment tweaks and fixes