Latest fixes (pre release)