Compose fields and bug fixes