Fix some bugs

Still unavaliable.