Fix a few little things from yuga and point kernel to correct location