Fix some bugs
Fix more bugs