more fixes, switch to local dependency