Bugfixes on installe