Fix approot issues