User update fixes