fix compile errors in previous commit. Issue #16.