Entity bug fixes, cruising support