Bugfixes preparing for V1.0.0