Fragment fixes