Initial merge after fixes