Latest fixes and removal of assembly mappings