Doc and boundary restriction fixes