Fixing minor errors

@vogdb please review