fixes for thomas