Some fixes .. asd reordering, definition loading