additional fixes/etc