Bug fixes in pipeline