Minor implementation changes