Various fixes from 08-10-14 call. Fixes #828