More performance changes