fix two issues