Fix again some bugs