Minor fixes done again