Minor improvements, break on pipe close