Fixes from Åsa