Fix some reported issues