Fix two regression issues