Fixes by Lis and prologo