Final (?) fixes by Lis