Cleanup, piping fixes