Fixes for missing external modifications