Small fixes

For Issue #83