Minor changes on restrains handling