V1.0.0 fixes

Merge in version 1.0.0