Fixes for teia