Fix some bugs
Small changes