VP-297: More fixes