Some other changes to improve stability