Some fixes based upon Lincoln's feedback