upgrading to spindle 3.0.0-M4 and fixing compatibility breaks