fix refs
sync with master