small fixes, THT