Bug fixes for 2d physics

No match.