Various fixes and mark as stable