Small fixes THT