fixes and go to definition support