Minor fixes (Refs: #108)