Minor code fixes for version 2.0.0