Fixed proto and other details