Bug fixes in ott-extras