some fixes for ova compatibility