Fixes for Thomas