refs #NA Some fixes