Merge various fixes from master