fixes done to passage to 2.0.4