Apply fixes from readers. Thank you readers