Merge fixes from brateloslava