Some addional fixes on OBJ management