More Fixes for 1.0