fix metadata and includes