Fixes for handover