Bugfixes - adapt to online given version