All fixes done