Added Victor's fixes