Remove sudo and other fixes