Fixes by Lis