Small fixes done