Fixes - internals technologies
Additional fixes in internals