fixes to make work when integrated directly into TVH