Some bugfixes for visualisation