Bug fixes relating to svea-15