Fixes listed in e-mail thread