Fixes Issues in embededed code