Few fixes from michalkutil