resolve: Two more fixes