immediate fixes done