Updated to clean up some inconsistences at release time