Bug fixes for 2d physics