Some fixes for olang-col to work