(misc) Some updates for the next release