Fix minors bugs
Fix minor bug