Fixed minor issues after tornado and motor update