MG1 and Dynamic bug fixes