Entity tool fixes