Fix minor changes
Fix minor errors