Some fixes with suspension