Fix some ooops.