Fix ea errors and update to head (5.3.15)