Minor fixes (Refs: #107)