Fix fragment issues