Minor fixes to help fragment