hacky fixes for output parsing issues