* fixes fro fixes from Sven-Ola