2.0.4 Bugfixes