more fixes - src order