various fixes - metis fausing trouble as usual