Fixes for extension conflicts + original source order