Boundary method, minor fixes