tweaks to support child events