few more fixup and add some optinal deps