More performance fixes, uncomment point check