Bugfixes, private section