1.07 Beta 1 (quick fixes before we merge big changes)