Small fixes from Thorsten