Minor changes #28