Fixing order of changes in v0.2.6 for clarity