some fixes for Havana

include: PRD-2528, PRD-2558