Added Vertere bug fixes from Knud Moeller