Fix some bugs (but ...)