Bug fixes related to LiveTest failures