Fix problem with newer (or older?) bullet version (thanks travis)
More fixes