Merging fixes from polish branch