Fix two issues