Fix some reported issues...