begin fixes