Fix some containers opening another ones and fix tooltip for a barrel

(in .tmx file as well)