More early testing and bug fixes