More fixes for #39

Now with physwarp independence