Minor implementation changes.