Fixed Initialize/Finalize ordering, cleaned up Sources function handler.