Fixes after the 1.0-M3 release