Bug fixes and resolving transitive dependencies