Updated Local_manifest with latest sources

Fixed some issues