solve two minor issues