Pre v1.0 Bugfixes

As we get closer to 1.0, some needed bugfixes