Some recent changes for the next alpha version