Various fix for 1.0.0