Small fixes ...