Got rid of most segfaults in physics samples