More testing and fixes