Fix two possible issues